Merge from mainline.

author Paul Eggert <eggert@cs.ucla.edu>

Fri, 25 Feb 2011 07:36:37 +0000 (23:36 -0800)

committer Paul Eggert <eggert@cs.ucla.edu>

Fri, 25 Feb 2011 07:36:37 +0000 (23:36 -0800)
author Paul Eggert <eggert@cs.ucla.edu>
Fri, 25 Feb 2011 07:36:37 +0000 (23:36 -0800)
committer Paul Eggert <eggert@cs.ucla.edu>
Fri, 25 Feb 2011 07:36:37 +0000 (23:36 -0800)
diff --cc ChangeLog
Simple merge
diff --cc configure
Simple merge
author	Paul Eggert <eggert@cs.ucla.edu>
	Fri, 25 Feb 2011 07:36:37 +0000 (23:36 -0800)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Fri, 25 Feb 2011 07:36:37 +0000 (23:36 -0800)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history